From c0bb03a5ef7e88ef4b43d3093e05635b3507b6d2 Mon Sep 17 00:00:00 2001 From: Andrew Cooper Date: Fri, 20 Jul 2018 15:21:51 +0100 Subject: [PATCH] x86/shadow: Use MASK_* helpers for the MMIO fastpath PTE manipulation MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Drop the now-unused SH_L1E_MMIO_GFN_SHIFT definition. No functional change. Signed-off-by: Andrew Cooper Reviewed-by: Roger Pau Monné Reviewed-by: Wei Liu Reviewed-by: Tim Deegan --- xen/arch/x86/mm/shadow/types.h | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/xen/arch/x86/mm/shadow/types.h b/xen/arch/x86/mm/shadow/types.h index 0430628042..8c0c802a49 100644 --- a/xen/arch/x86/mm/shadow/types.h +++ b/xen/arch/x86/mm/shadow/types.h @@ -317,12 +317,11 @@ static inline int sh_l1e_is_gnp(shadow_l1e_t sl1e) #define SH_L1E_MMIO_MAGIC 0xffffffff00000001ULL #define SH_L1E_MMIO_MAGIC_MASK 0xffffffff00000009ULL #define SH_L1E_MMIO_GFN_MASK 0x00000000fffffff0ULL -#define SH_L1E_MMIO_GFN_SHIFT 4 static inline shadow_l1e_t sh_l1e_mmio(gfn_t gfn, u32 gflags) { return (shadow_l1e_t) { (SH_L1E_MMIO_MAGIC - | (gfn_x(gfn) << SH_L1E_MMIO_GFN_SHIFT) + | MASK_INSR(gfn_x(gfn), SH_L1E_MMIO_GFN_MASK) | (gflags & (_PAGE_USER|_PAGE_RW))) }; } @@ -333,7 +332,7 @@ static inline int sh_l1e_is_mmio(shadow_l1e_t sl1e) static inline gfn_t sh_l1e_mmio_get_gfn(shadow_l1e_t sl1e) { - return _gfn((sl1e.l1 & SH_L1E_MMIO_GFN_MASK) >> SH_L1E_MMIO_GFN_SHIFT); + return _gfn(MASK_EXTR(sl1e.l1, SH_L1E_MMIO_GFN_MASK)); } static inline u32 sh_l1e_mmio_get_flags(shadow_l1e_t sl1e) -- 2.30.2